Merge "Fix a bug: applied wrong layout for advanecd button flag"