Bug 1043595 - [B2G][Camera] Camera capture button highlight animation is square
Adding the layout related to bug 1046836
Adding the layout related to bug 1046836
Merge branch 'master' of https://github.com/iGormilhit/gaia