Merge "Ensure buttons appears on top of super-blur-view control" into devel/master