Fix for enabled button being displayed in block.
Fix for enabled button being displayed in block.

justinslee/Wai-Not-Makahiki,yongwen/makahiki,jtakayama/ics691-setupbooster,yongwen/makahiki,yongwen/makahiki,jtakayama/makahiki-draft,csdl/makahiki,jtakayama/makahiki-draft,jtakayama/makahiki-draft,csdl/makahiki,jtakayama/makahiki-draft,csdl/makahiki,jtakayama/ics691-setupbooster,csdl/makahiki,jtakayama/ics691-setupbooster,yongwen/makahiki