Merge "Fix issue where home layout click listener was being attached before it was initialized."