m-popover: simplify some (staging for move)
m-popover: simplify some (staging for move)

wiseman/mavelous,jiusanzhou/mavelous,wiseman/mavelous,jiusanzhou/mavelous,wiseman/mavelous,jiusanzhou/mavelous,jiusanzhou/mavelous