Merge "WatchAction: Clean up redundant getFormFields() and show()"