Merge "Fix invisible FloatingActionButton pre-ICS" into mnc-ub-dev